acme: Log acme.sh command invocation

Signed-off-by: Toke Høiland-Jørgensen <[email protected]>

diff --git a/net/acme/Makefile b/net/acme/Makefile
index 613d96ebfca3fe9b03aea0e0442dbe58cc4d4f6f..b85636f849259edb94300e3c22ca650816e344d8 100644 (file)
--- a/net/acme/Makefile
+++ b/net/acme/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme
 PKG_VERSION:=2.8.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/Neilpang/acme.sh/tar.gz/$(PKG_VERSION)?

diff --git a/net/acme/files/run.sh b/net/acme/files/run.sh
index b7a6f1899bfca6a1a2c5dff36b4b08e7cc3b12dc..3d25321d78debf18b518379af3e159dc88d8e6f5 100644 (file)
--- a/net/acme/files/run.sh
+++ b/net/acme/files/run.sh
@@ -54,6 +54,12 @@ get_listeners() {
     done
 }
 
+run_acme()
+{
+    debug "Running acme.sh as '$ACME $@'"
+    $ACME "$@"
+}
+
 pre_checks()
 {
     main_domain="$1"
@@ -218,7 +224,7 @@ issue_cert()
             moved_staging=1
         else
             log "Found previous cert config. Issuing renew."
-            $ACME --home "$STATE_DIR" --renew -d "$main_domain" $acme_args && ret=0 || ret=1
+            run_acme --home "$STATE_DIR" --renew -d "$main_domain" $acme_args && ret=0 || ret=1
             post_checks
             return $ret
         fi
@@ -246,7 +252,7 @@ issue_cert()
         acme_args="$acme_args --webroot $webroot"
     fi
 
-    if ! $ACME --home "$STATE_DIR" --issue $acme_args; then
+    if ! run_acme --home "$STATE_DIR" --issue $acme_args; then
         failed_dir="$STATE_DIR/${main_domain}.failed-$(date +%s)"
         err "Issuing cert for $main_domain failed. Moving state to $failed_dir"
         [ -d "$STATE_DIR/$main_domain" ] && mv "$STATE_DIR/$main_domain" "$failed_dir"